Merge from emacs-24 branch; up to r108082
authorChong Yidong <cyd@gnu.org>
Sat, 28 Jul 2012 15:12:37 +0000 (23:12 +0800)
committerChong Yidong <cyd@gnu.org>
Sat, 28 Jul 2012 15:12:37 +0000 (23:12 +0800)
commit29ad73fb43d2d45a7194a71071084ea536481ec3
treec76fe9edfca6727b9e272b84abe457895406f9b4
parent0d328417c71cac7ef3aeaeaa241a8e1944fbb7a5
parentd73ed2feb90ebdfd1242c502b4127e21fe129cca
Merge from emacs-24 branch; up to r108082